From 9397b0dc0a4dd7151f9b0371cd9421ff26b42289 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 17 Feb 2004 22:25:13 +0000 Subject: [PATCH] ...and don't forget to initalize priv->columns to 1. Tue Feb 17 23:28:33 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize priv->columns to 1. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenu.c | 6 +++++- 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e40fde338e..46e1aadfd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 17 23:28:33 2004 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize + priv->columns to 1. + Tue Feb 17 23:11:21 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e40fde338e..46e1aadfd6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Feb 17 23:28:33 2004 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize + priv->columns to 1. + Tue Feb 17 23:11:21 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e40fde338e..46e1aadfd6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Feb 17 23:28:33 2004 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize + priv->columns to 1. + Tue Feb 17 23:11:21 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e40fde338e..46e1aadfd6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Feb 17 23:28:33 2004 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize + priv->columns to 1. + Tue Feb 17 23:11:21 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e40fde338e..46e1aadfd6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Feb 17 23:28:33 2004 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize + priv->columns to 1. + Tue Feb 17 23:11:21 2004 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index acdd57a3c3..6bc690b025 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -710,6 +710,8 @@ gtk_menu_window_size_request (GtkWidget *window, static void gtk_menu_init (GtkMenu *menu) { + GtkMenuPrivate *priv = gtk_menu_get_private (menu); + menu->parent_menu_item = NULL; menu->old_active_menu_item = NULL; menu->accel_group = NULL; @@ -755,6 +757,8 @@ gtk_menu_init (GtkMenu *menu) menu->lower_arrow_prelight = FALSE; MENU_NEEDS_RESIZE (menu) = TRUE; + + priv->columns = 1; } static void @@ -949,7 +953,7 @@ gtk_menu_do_remove (GtkMenuShell *menu_shell, single_column = priv->columns == 1; /* Recalculate these, assuming the child has already been removed. - * Note that an empty menu is assumed to have one column. + * Note that an empty menu is assumed to have one column */ priv->rows = 0; priv->columns = 1; -- 2.30.2